Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 31 Oct 2011 19:53:29 +0000 (12:53 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 31 Oct 2011 19:53:29 +0000 (12:53 -0700)

Trivial merge